Return positive descent.

2000-12-04  Alexander Larsson  <alexl@redhat.com>

	* gdk/linux-fb/gdkpango-fb.c (pango_fb_font_get_metrics):
	Return positive descent.

diff --git a/ChangeLog b/ChangeLog
index 5affd689da87d9d4d1ca635233311fe612f29edb..8cf750dc3b3f9c86a55d5ea5974ed05703f541be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-04  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkpango-fb.c (pango_fb_font_get_metrics):
+       Return positive descent.
+
 2000-12-02  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove "draw" virtual

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5affd689da87d9d4d1ca635233311fe612f29edb..8cf750dc3b3f9c86a55d5ea5974ed05703f541be 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2000-12-04  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkpango-fb.c (pango_fb_font_get_metrics):
+       Return positive descent.
+
 2000-12-02  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove "draw" virtual

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5affd689da87d9d4d1ca635233311fe612f29edb..8cf750dc3b3f9c86a55d5ea5974ed05703f541be 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2000-12-04  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkpango-fb.c (pango_fb_font_get_metrics):
+       Return positive descent.
+
 2000-12-02  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove "draw" virtual

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5affd689da87d9d4d1ca635233311fe612f29edb..8cf750dc3b3f9c86a55d5ea5974ed05703f541be 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2000-12-04  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkpango-fb.c (pango_fb_font_get_metrics):
+       Return positive descent.
+
 2000-12-02  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove "draw" virtual

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5affd689da87d9d4d1ca635233311fe612f29edb..8cf750dc3b3f9c86a55d5ea5974ed05703f541be 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2000-12-04  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkpango-fb.c (pango_fb_font_get_metrics):
+       Return positive descent.
+
 2000-12-02  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove "draw" virtual

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5affd689da87d9d4d1ca635233311fe612f29edb..8cf750dc3b3f9c86a55d5ea5974ed05703f541be 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2000-12-04  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkpango-fb.c (pango_fb_font_get_metrics):
+       Return positive descent.
+
 2000-12-02  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove "draw" virtual

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5affd689da87d9d4d1ca635233311fe612f29edb..8cf750dc3b3f9c86a55d5ea5974ed05703f541be 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2000-12-04  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkpango-fb.c (pango_fb_font_get_metrics):
+       Return positive descent.
+
 2000-12-02  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove "draw" virtual

diff --git a/gdk/linux-fb/gdkpango-fb.c b/gdk/linux-fb/gdkpango-fb.c
index c0b054f0011c9f57b9c5be9197dd132f6547d316..75b28f6a7366f2d9644dd28f6998d7da6616743c 100644 (file)
--- a/gdk/linux-fb/gdkpango-fb.c
+++ b/gdk/linux-fb/gdkpango-fb.c
@@ -841,7 +841,7 @@ pango_fb_font_get_metrics (PangoFont        *font,
   if (metrics)
     {
       metrics->ascent = (ftf->size->metrics.ascender * PANGO_SCALE + 32) >> 6;
-      metrics->descent = (ftf->size->metrics.descender * PANGO_SCALE + 32) >> 6;
+      metrics->descent = ((-ftf->size->metrics.descender) * PANGO_SCALE + 32) >> 6;
     }
 }